Skip to content

Remove Default master encryption key from settings.#1851

Merged
vamsimanohar merged 1 commit intoopensearch-project:mainfrom
vamsimanohar:remove-default-master-key
Jul 11, 2023
Merged

Remove Default master encryption key from settings.#1851
vamsimanohar merged 1 commit intoopensearch-project:mainfrom
vamsimanohar:remove-default-master-key

Conversation

@vamsimanohar
Copy link
Member

@vamsimanohar vamsimanohar commented Jul 11, 2023 •
edited
Loading

Description

Testing

Request:

{
  "name": "aws_prometheus3",
  "connector": "PROMETHEUS",
  "allowedRoles": [],
  "properties": {
    "prometheus.uri": "https://localhost:9090",
    "prometheus.auth.type" : "basicauth",
    "prometheus.auth.username" : "username",
    "prometheus.auth.password" : "password"
  }
}

Response

{
  "status": 400,
  "error": {
    "type": "IllegalStateException",
    "reason": "Invalid Request",
    "details": "Master key is a required config for using datasource APIs. Please set the following config in opensearch.yml in all the cluster nodes. More details can be found here: https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/admin/datasources.rst#master-key-config-for-encrypting-credential-information"
  }
}

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch 2 times, most recently from d81fbf3 to 10f5719 Compare July 11, 2023 21:54
@codecov
Copy link

codecov bot commented Jul 11, 2023 •
edited
Loading

Codecov Report

Merging #1851 (42f4ed3) into main (f5031a7) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main    #1851   +/-   ##
=========================================
  Coverage     97.39%   97.39%           
- Complexity     4600     4602    +2     
=========================================
  Files           401      401           
  Lines         11381    11386    +5     
  Branches        843      843           
=========================================
+ Hits          11084    11089    +5     
  Misses          290      290           
  Partials          7        7
Flag Coverage Δ
sql-engine 97.39% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ql/datasources/rest/RestDataSourceQueryAction.java 0.00% <ø> (ø)
...rch/sql/opensearch/setting/OpenSearchSettings.java 100.00% <ø> (ø)
...earch/sql/datasources/encryptor/EncryptorImpl.java 100.00% <100.00%> (ø)

@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch from 10f5719 to 449cc17 Compare July 11, 2023 21:59
@vamsimanohar vamsimanohar added the bug Something isn't working label Jul 11, 2023
@vamsimanohar vamsimanohar self-assigned this Jul 11, 2023
@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch 2 times, most recently from 6efc172 to 39ad8a2 Compare July 11, 2023 22:25
@vamsimanohar vamsimanohar marked this pull request as ready for review July 11, 2023 22:27
@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch from 39ad8a2 to 9a73353 Compare July 11, 2023 22:31
@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch from 9a73353 to 208d703 Compare July 11, 2023 22:34
@vamsimanohar
Remov:e Default master key
42f4ed3 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
@vamsimanohar vamsimanohar force-pushed the remove-default-master-key branch from 208d703 to 42f4ed3 Compare July 11, 2023 22:36
@vamsimanohar vamsimanohar merged commit bc02815 into opensearch-project:main Jul 11, 2023
This was referenced Jul 11, 2023
Merged
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
@vamsimanohar @github-actions
Remov:e Default master key (#1851)
665dfef 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit bc02815)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
@vamsimanohar @github-actions
Remov:e Default master key (#1851)
19d19d1 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit bc02815)
vamsimanohar added a commit that referenced this pull request Jul 12, 2023
@opensearch-trigger-bot @vamsimanohar
[Backport 2.x] Remove Default master encryption key from settings. (#…
f2d5ed3 
…1853)

* Remov:e Default master key (#1851)

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit bc02815)

* Fix BWC tests

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>

---------

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
vamsimanohar added a commit that referenced this pull request Jul 12, 2023
@opensearch-trigger-bot @vamsimanohar
[Backport 2.9] Remove Default master encryption key from settings. (#…
02da891 
…1854)

* Remov:e Default master key (#1851)

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit bc02815)

* Fix BWC tests

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>

---------

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 20, 2023
@vamsimanohar @MitchellGale
Remov:e Default master key (opensearch-project#1851)
e5dc96f 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 28, 2023
@vamsimanohar @MitchellGale
Remov:e Default master key (opensearch-project#1851)
c6cdf9d 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@penghuo penghuo penghuo approved these changes

@ps48 ps48 ps48 approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@Yury-Fridlyand Yury-Fridlyand Awaiting requested review from Yury-Fridlyand Yury-Fridlyand is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

Assignees

@vamsimanohar vamsimanohar

Labels

backport 2.x backport 2.9 bug Something isn't working

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vamsimanohar @penghuo @ps48